Fixed issue with function inlining