Cleaning up prev. fix

Cleaning up the fix I committed earlier