Fix #4 (Thanks to murphy(at)rubychan.de)