fixing #169 ... some of those bugs are really weird ... my brain hurts ;)
fixing #169 ... some of those bugs are really weird ... my brain hurts ;)

nudge-nudge/punakea,nudge-nudge/punakea,nudge-nudge/punakea,nudge-nudge/punakea,nudge-nudge/punakea