Issue #2132697 by mahfiaz: Fixed errors created in previous commit. Sorry.