#30 small fix