Fixed a bug of @pmaene