fix #4 and #5 again