stupid bug fixes