#529 Fixed