somehow related to #14 and #16. Fixes.