Fix hardcoded and wrong array size
Add return just in case