Fixing annotations
Adding test for bug #5656
Fixing bug #5656