Should fix issue #14