Temporary hack to fix a bug