fixed bug 459 (this patch is dedicated to charlie)