Tracked down an knocked out bugs caused by int size