Bug fix for 32bit OS