Upated for issue 46