Fix Bug420462--Signed-off-by: Adrian Aichner <adrian.aichner@gmail.com>