Added an experimantal fix to a bug