Hard coding fix