Changed back parameters to keep API compatibility