quick fix for production - couple of bugs needs to fixed for next version