Minor workaround