Fixes Gizra/og#17