Closes #337 (closed) I've also tested that this doesn't break #332 (closed) and it doesn't:)
This will create a new commit in order to revert the existing changes.
