Added test to this fix and disabled the fix, so as to show that the new test will fail without it.
(Will re-enable it as soon as travis is done)