Fixed a bug which might be caused by merge (#39)