Bugfixing for last new functions