fixed bug spotted by exception /cc @evilaliv3