[bug] #43

Solves #43