Quick fix workaround for some issue