Issue#411 - Fix commits