Fixed kirderf1#7