Fix for runtime format