Bug/421

This should fix #421