Fix for Thunder