bug fixes :)