Test for new bug on #286
Fix for new bug on #286