need small workaround