Fix for bug #923913, Calling convention problems.