#21 should be fixed with this