Issue 291 Tentative Fix