Fix possible issue on neko, resolves #488