#306 Bug fixed