[Issue 15] Apparently fixed.