Fixed #44.

Dear kids, Code Duplication is bad. Here is an example.