Fix the unfixed in #530