Try to fix design compatibility