Partially fixes a bug introduced in #18