Workaround for dependency issue