fix #413
Improvements in dynamic css