Fix for argument passing