Fix for MDK