Temporary hack, to be reverted?