Fixed both now