adjusting for issue #25