Quick fix (0.0.7-SWAG)