#162 Moved function call