Bug #63 fixed