Fix commit 19af72