Solution for issue 12 in gmanny/Pechkin