fixed for compilation and proper solution setup