Odd fix maybe