Reverted wrongly changed code