reverted changes to keep compatibility
added missing dependency