Fix for issue  #24