Proposed solution for #929
Proposed solution for #929

Yetangitu/frontend,ashwingj/frontend,Yetangitu/frontend,mrzen/trovebox,EMarcais/frontend,ashwingj/frontend,mrzen/trovebox,mrzen/trovebox,EMarcais/frontend,Yetangitu/frontend,yetixxx83/frontend,yetixxx83/frontend,meatcar/frontend,Yetangitu/frontend,meatcar/frontend,photo/frontend,mrzen/trovebox,photo/frontend,ashwingj/frontend,meatcar/frontend,meatcar/frontend,photo/frontend,photo/frontend,yetixxx83/frontend,EMarcais/frontend,ashwingj/frontend,EMarcais/frontend,yetixxx83/frontend