[BUG] Closes #1