Cleaned version of EP bug fix

Closes !1853 (closed), !1854 (closed), and #1789 (closed)

Adds test case to prevent regression and does not repeat info already contained in the manual