Added possible workaround.