bug fixes
pass location