Ugly way to Fix some errors