resolved #2
resolved #1