Debug for #502