commited for bug #55 #54