minor cleanup
added bug/issue :(