this fix #1

fixing almost issue 1