Added code to handle issue #318