Fixed hard coding bug