Added test
Added fix