Merge pull request #542 from gameblabla/mdec_fix