Bug

Implements #42