quick fix issue #1