Bug 287 fixed