T 4223

Ticket #4223 fixes.

http://bugs.themidnightcoders.com/browse/BKNDLSS-4223