Added strange workaround