FIXED Force Close introduced with last commit