Added fix to issue 19