Should fix issue #13