final touch
fixed bug #5