Fixes #14

This fixes #14