possible bug fixes