#35 dirty fix to follow generate transacions