Fix for mixed mode