quick fix on #1