Startup issue fix
Authored by: Johannes Binder 2014-05-27
Parent(s): [089ff0]
Child(ren): [010ff5][d753a0]