solution for 1.9.3