Fixed "NullPointerException" - all working :D