Fix for arguments evaluation