Fixed issue with imcorrect empty function implementation/