Issue #1 Prepare quick fix