Fixed old methods