removed useless workaround