Adding janky workaround to bug