Removed hardcoded 32