bug fixing by master module developer
merged