Fixed issues #334 and #335