FIXES
Added regression test