Fixed strange bugs ...