Fifth commit. fix #2