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