#M-504 Fixed