It should fix #285 and #325