bugfix for live issue