[FE] Fixed issues #5 and #6