Changed to handle issue#1