#gt-186 bugs fixed