Ismail fixes

Fix #18