on the fly bug fixes