FIX: this should fix #1