This should fix #12

Hacked OL for this a bit though...