CRASH-106: Quick and dirty fix with the hard coded version