Making some updates to fix a bug