bug fixing my own bug fixes