removing hash dot hack, checking for hash keys before use