Updated for issue 46