Matt's fix for '#() issue