Fixes StackOverFlowError

Refs #6