fixed issues #563 and #582