Some hacky fix