temporary hack to work around the freezing issue (#64)