fixed solution #15
fixed #17