Fix for different types