Issue#411 - Fix implementation errors