Fixed hotbug #33.
Merge for hotbug #33