Fixes #76