Hopefully fixed current revision