Dirty workaround todo