This should fix #12

Hacked OL a bit for this, though...