Bugfixing last new function