neat bug fixing