Last commit was broken

This commit fixed that previous crashing commit