** Mystery solved, fixes #20 ... now for real