One small step to resolving #504