better solution #694