BUG-123 #close Fixing a bug