add line from issue7
add line from issue8