[#298] [#305] Fixed