Added a crucial fix.