Fixed more bogues

Revision:
18:10bc91c3fb42
Parent:
17:969aa15f783d