actually fixed bug #14