Removed too strict behavior [closes #2]